Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 14:40:12 +0000 (14:40 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 14:40:12 +0000 (14:40 +0000)
commit5aec74f95d40a2b87c9966e273afacac1d647b12
tree5c2c674d74efbf358d1deeaa0172c91bbee7dfc7
parentaf6e6f4cc7e13bb3e3ad8ca80cbc3f67d3444a3c
parentcc63ab059aa92e6f0a7a01f77adef06ab7073aa2
Merge from mainline.